x86: Increase default max CPUs to 64.

Also remove compile-time limit of 32 for i386. It is no longer
required, since a cpumask was moved out of struct page_info.

Signed-off-by: Wei Gang <gang.wei@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 592f2570721a8d95792db41f9ec2bf3774d37ef7..ef79b122b2b9d5949f2ac8b9777d49dfd74a1817 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -49,13 +49,10 @@
 #ifdef MAX_PHYS_CPUS
 #define NR_CPUS MAX_PHYS_CPUS
 #else
-#define NR_CPUS 32
+#define NR_CPUS 64
 #endif
 
 #ifdef __i386__
-#if NR_CPUS > 32
-#error "Maximum of 32 physical processors supported by Xen on x86_32"
-#endif
 /* Maximum number of virtual CPUs in multi-processor guests. */
 #define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS
 #endif